projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ebc96cd 40ae982)
bitkeeper revision 1.1159.1.522 (41d49c4comhlitBINhom6DG5l00gaA)
authorkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Fri, 31 Dec 2004 00:24:44 +0000 (00:24 +0000)
committerkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Fri, 31 Dec 2004 00:24:44 +0000 (00:24 +0000)
Merge scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk

1  2 
xen/Makefile patch | diff1 | diff2 | blob | history

diff --cc xen/Makefile
Simple merge
Unnamed repository; edit this file 'description' to name the repository.